Dependency fix so that gbversion.h _really_ tracks the version in configure.in

diff --git a/Makefile.in b/Makefile.in
index af3f51511f908405c0a5f40bf1824bf1280fb312..604584a06a5190a3ee538ea1b887be1501a4d04d 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -105,10 +105,11 @@ gpsbabel$(EXEEXT): configure Makefile $(OBJS) @GPSBABEL_DEBUG@
 gpsbabel-debug: $(OBJS)
        $(CC)  $(CFLAGS) $(LDFLAGS) $(OBJS) @LIBS@ @EFENCE_LIB@ @EXPAT_LIB@ @USB_LIBS@ $(OUTPUT_SWITCH)$@
 
-Makefile: Makefile.in config.status xmldoc/makedoc.in
+Makefile gbversion.h: Makefile.in config.status xmldoc/makedoc.in
        CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status 
 
-gbversion.h: configure config.status
+config.status: configure 
+       $(SHELL) config.status --recheck
 
 jeeps/gpslibusb.o: 
        $(CC)  @CPPFLAGS@ -c $(GBCFLAGS) @USB_CFLAGS@ @srcdir@/jeeps/gpslibusb.c $(OUTPUT_SWITCH)$@

diff --git a/configure b/configure
index 1aad951bed00e901df642d7c2e88d53186b57b7c..5acd2f53970ae7e6c05037d502e25e6bd82ff179 100755 (executable)
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59 for GPSBabel 1.3.2.
+# Generated by GNU Autoconf 2.59 for GPSBabel 1.3.3.
 #
 # Report bugs to <BUG-REPORT-ADDRESS>.
 #
@@ -269,8 +269,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
 # Identity of this package.
 PACKAGE_NAME='GPSBabel'
 PACKAGE_TARNAME='gpsbabel'
-PACKAGE_VERSION='1.3.2'
-PACKAGE_STRING='GPSBabel 1.3.2'
+PACKAGE_VERSION='1.3.3'
+PACKAGE_STRING='GPSBabel 1.3.3'
 PACKAGE_BUGREPORT='BUG-REPORT-ADDRESS'
 
 ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS PACKAGE_RELEASE GBMAJOR GBMINOR GBMICRO build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA SET_MAKE  FILEINFO RC LIBUSBCONFIG USB_LIBS USB_CFLAGS OSJEEPS GBSER ZLIB EXPAT_LIB EFENCE_LIB GPSBABEL_DEBUG INSTALL_DEBUG DOCDIR LIBOBJS LTLIBOBJS'
@@ -738,7 +738,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures GPSBabel 1.3.2 to adapt to many kinds of systems.
+\`configure' configures GPSBabel 1.3.3 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -800,7 +800,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of GPSBabel 1.3.2:";;
+     short | recursive ) echo "Configuration of GPSBabel 1.3.3:";;
    esac
   cat <<\_ACEOF
 
@@ -929,7 +929,7 @@ fi
 test -n "$ac_init_help" && exit 0
 if $ac_init_version; then
   cat <<\_ACEOF
-GPSBabel configure 1.3.2
+GPSBabel configure 1.3.3
 generated by GNU Autoconf 2.59
 
 Copyright (C) 2003 Free Software Foundation, Inc.
@@ -943,7 +943,7 @@ cat >&5 <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by GPSBabel $as_me 1.3.2, which was
+It was created by GPSBabel $as_me 1.3.3, which was
 generated by GNU Autoconf 2.59.  Invocation command line was
 
   $ $0 $@
@@ -1281,7 +1281,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
 # YYYYMMDD, please, if beta, i.e. "-beta20060413"
-PACKAGE_RELEASE="-beta20061117"
+PACKAGE_RELEASE="-beta20061125"
 
 cat >>confdefs.h <<_ACEOF
 #define PACKAGE_RELEASE "$PACKAGE_RELEASE"
@@ -3812,7 +3812,7 @@ _ASBOX
 } >&5
 cat >&5 <<_CSEOF
 
-This file was extended by GPSBabel $as_me 1.3.2, which was
+This file was extended by GPSBabel $as_me 1.3.3, which was
 generated by GNU Autoconf 2.59.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -3872,7 +3872,7 @@ _ACEOF
 
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
-GPSBabel config.status 1.3.2
+GPSBabel config.status 1.3.3
 configured by $0, generated by GNU Autoconf 2.59,
   with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
 

diff --git a/configure.in b/configure.in
index f018e7aa9d955e02e9f250db5992c023207fb207..cea7db0c1ef54518e24b8ffb23dd8c43c9dfa4d0 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -6,7 +6,7 @@ AC_PREREQ(2.59)
 AC_INIT(GPSBabel, 1.3.3, BUG-REPORT-ADDRESS)
 
 # YYYYMMDD, please, if beta, i.e. "-beta20060413"
-PACKAGE_RELEASE="-beta20061117"
+PACKAGE_RELEASE="-beta20061125"
 AC_DEFINE_UNQUOTED(PACKAGE_RELEASE, "$PACKAGE_RELEASE", [Define to the release name of this package.])
 AC_SUBST(PACKAGE_RELEASE)
 

diff --git a/gbversion.h b/gbversion.h
index 77b9f97c1eb37b144d798165c03c925ffc6a2c0b..c1075bd69b6048bfed94fc8dc3382677fd5b9663 100644 (file)
--- a/gbversion.h
+++ b/gbversion.h
@@ -1,2 +1,2 @@
-#define VERSION "1.3.2-beta20061117"
+#define VERSION "1.3.3-beta20061125"